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 am: 4d1253afcc
am: c50e273b0a

Change-Id: I359f0dc5c2e90bc9bb8f54b0a5bbab835acaa1e0