[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5
am: 305a41b7a6  -s ours

Change-Id: I902e6af1c2ef49d454a7d1bae92d8e20ea263b0e