Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours
am: dd472080f0

Change-Id: Ic8f642fbbe53a0861550121cfcab0e4576c9e755