[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9 am: cd1be81d -s ours am: 451bcb50 am: 656a8b94 am: 09b7ea0c Change-Id: Ie52cf55c32fd2d33830541f43675f64fcab0bbc3