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

* commit 'a6fab6e114a80364714c463db3ac4b204730f08b':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE