Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee3 am: a821245d am: 156fa32e  -s ours
am: de9cb7ed  -s ours

Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab