Merge "Prevent bit buffer counter overflow." into pi-dev am: 42f714f2ab
am: f5b4032cb3

Change-Id: Iea9bfb25f421845921ddbcfbc0f612b3e435d1eb