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

Change-Id: I1e47c963728906cb2283a353c882017368d07747