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

Change-Id: I07162b0fa7bbe2423d122f64dec9f43fde4aaad8