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

Change-Id: I24b0840ec77d740836f43c14b25b27ee4d964a6a