Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev...

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee3 am: a821245d am: 156fa32e  -s ours am: de9cb7ed  -s ours am: 2c112c4a am: 2411b4f7  -s ours am: aa0b7188 am: 9e2cf8e5 am: f937aabb am: f7cde317  -s ours am: 1fd70c20 am: ff5be765 am: 6ca67f06 am: e385c8a0 am: aeb33eb0
am: ff22f820  -s ours

Change-Id: Ib425635a0e9d254b881a8a64f8d18d426350b6dd