DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6
am: 96fbbc31db  -s ours

Change-Id: Icab41a4c796ad9f31128dd8289ea4839d5823605