am "Cumulative patch from commit f51f54a007e0de1d413dee3523472d3bbeed2ecc"

merged from goog/mirror-m-wireless-internal-release
7f65602 Cumulative patch from commit f51f54a007e0de1d413dee3523472d3bbeed2ecc