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

Change-Id: Ic712133bed222d14bf7823cf61fbce5ccb9d50b1