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

Change-Id: I50a91bc415fb1aa9b0baf8eb48e208f3792425bc