Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70 am: 5d1ce82bb3 am: 4c5f8398f0 am: 31b147f2f7 am: b9002a6643 am: 448e61d0d7 am: b1f14803fe
am: 8368b2be1a

Change-Id: Id3d13a1a7187ceb11640117f98f9f94b8c527452