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

Change-Id: Ia5853c9741163b5e38a432ca645e4082bfa0a7bb