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 am: e8fb34b44c am: c4054a8b7f
am: 885acaff75

Change-Id: Ib675821a67fad6caf4875fa0de2a88b1f8c0ede1