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

Change-Id: I9ea32d31b1281689c4b5997a6c328630031c1795