am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913"

merged from goog/mirror-m-wireless-internal-release
2f4f522 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913