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

Change-Id: I80e715d7dc65b82d89249b163c2198e5c0561761