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

Change-Id: Iafb53ad6b61de977951f4a913250bcdc21e0af8d