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

Change-Id: Ia8706bf387c1f779f31952fe287e3414e67ccbbe