Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am: 07beec953b am: 4707bd455e am: 4fa88b4ddb am: 697265ac3c  -s ours am: 2c55bbd94e am: 3122d32b33
am: 1ce6b63a8c

Change-Id: I242be896ccfece2ef9ca158974e67c577c917679