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

Change-Id: I08dab5efd089c0cb7b93638d81cba96efad2d322