Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b
am: 4130501c19

Change-Id: I9ee79ce0bc865fd3edb1fe67df6402ed1abb7c8c