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

Change-Id: I4fda9228f764a867f113608a775f95f53cf9a80d