Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am: 07beec953b
am: 4707bd455e

Change-Id: I5ad21560d103ccd099c8c82b591bdd432bad50aa