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

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