Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e
am: 5b0ca6a92c

Change-Id: I2da6bc9ff1d3503c62042391fce0a0957f11433b