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

Change-Id: I72dd260e2ee0f9560c9322c3aaf7b93c8008607e