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

Change-Id: I219cfeb4e12cf08d4aa40c917e2ac0d5d9a94596