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

Change-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0