Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev am: 69d20eab85 am: d098c42ebe am: a5affd0726
am: 236e162b3e

Change-Id: I84e082e8deafadf86db3eee683285a07f11c219f