[DO NOT MERGE] Check bounds in offsetToPtr
am: 1cbfeef9d8

Change-Id: Ib2dc9c376b0ad77a0b64ac3a762bc49e4ef6159f