am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
automerge: efa5b61  -s ours

* commit 'efa5b6142082d8c958b09a932fc972261c405912':