Cherry-picked from klp-wireless-dev-mirror SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4 Bug: 5485670 Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
Cherry-picked from klp-wireless-dev-mirror SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4 Bug: 5485670 Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5