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

Change-Id: Iaf72ca51af5b415db504fb3ca29a923b39c10d83