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 am: f7cde31747  -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a
am: e385c8a0b9

Change-Id: I013ae3547aa049a19aae6840e9e80a4a361527e3