[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625 am: 2d54d2c0 am: 305a41b7 -s ours am: e0f30ecd -s ours am: a482ac81 Change-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad