[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b  -s ours am: 31b54b9803
am: 56020da601  -s ours

Change-Id: I1117f04043a04adce2fc544052884e96430cc88a