[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours
am: a482ac81a5
Change-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad
This commit is contained in: