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

Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c