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

Change-Id: I4dfd0be0c7ab642e3d743062da218950a4b4129f