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
am: 48a36cdade  -s ours

Change-Id: I7cf97386f135d2814da0c7b33d7d80372b2bbaf2