[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8
am: cd1be81d25  -s ours

Change-Id: Idce25609138797d130d511ea84847ed71fc6dd65