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 am: bbb7ae05d4
am: 1aaef53444  -s ours

Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6