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

Change-Id: Ib43ba6aeba921b0d2c5b8649ac1e7015c48a7884