Merge "ByteBucketArray.h: fix typo" am: b848ce8e20 am: 0bb76346f5
am: 50bec961b3

Change-Id: I1ff25b8a7ff8385646ef128ae41e9794b6313cf8