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

Change-Id: I36dc1940833d3f671f1a1c1df0741d23d37e0b3b