Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am: 07beec953b am: 4707bd455e am: 4fa88b4ddb
am: 697265ac3c  -s ours

Change-Id: Ief5a09a0135b09bf0d8b308953684ba01dcb73d7