Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f  -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e  -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b
am: ee5b524516  -s ours

Change-Id: Ied7799fd88769b44cbe09b5e12df20f2f9670d50