Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e
am: ce677737ec  -s ours

Change-Id: I4ef50e6ff43d354f1542a0c1bb486ebfe14309e8