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

Change-Id: I133348d3f7dd0d9fbc6a24b9e23bd118986fb6d1