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