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

Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a