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

Change-Id: Ie6d46a6979bc89e2485fa4d2a25b21fc601e9783