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 am: 9c4d89c55f am: a1aa5cb34a
am: e3e01cc375

Change-Id: Ied0957306478565b83e6717659753ed53042248b