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

Change-Id: If5263f9fa84ed5f8fb5ed253f8b83ecc6ac6514b