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

Change-Id: If1fdac3bb2671cd2b4332053eb2c22ed7dbd8a28