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

Change-Id: I3306be5d7bb3867287732757dd14170527488b68