base

am "am 3bb5fdc7: (-s ours) Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed