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

Change-Id: Ia479e0311b5117ee77843b714550ee64b087922a