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
am: 52dcbd1051

Change-Id: I4fff4b10786395c4f61cc8ec2c8473ea56c87cb8