Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2
am: 2411b4f774  -s ours

Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7