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

Change-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9