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

Change-Id: I4bad8a26f1f721908f2b4bf6bcbe7497e93bc842