am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9"

merged from goog/mirror-m-wireless-internal-release
7ddec30 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9