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

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