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

* commit '7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c':