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 am: 221088d6df am: cc484a5cdf am: b091206f92
am: 9ef5a41923

Change-Id: I8f14bb9bb61d907614039acb773f2a177b6c8a9f