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

Change-Id: I890acbc20da8c6637642e9718e0748273bfe22be