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 am: aa0b718886 am: 9e2cf8e5c4
am: f937aabb0f

Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168