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

Change-Id: Ibb990a21657386359fe0d8b940c3ac86c01a413e