Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into nyc-dev am: 6c8098c8 am: 05c199a1 am: 2542711b am: 2c76d621 Change-Id: Ia479e0311b5117ee77843b714550ee64b087922a