Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into nyc-dev
am: 6c8098c8ab

Change-Id: I05f15f4152bf02a91384a88d648f4a9121b7f1d6