am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

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