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

Change-Id: I85273c31137127b733b51579c55618326d67a88c