[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25  -s ours am: 451bcb50c7 am: 656a8b9459
am: 09b7ea0c73

Change-Id: Ie52cf55c32fd2d33830541f43675f64fcab0bbc3