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
am: 4e7673e552  -s ours

Change-Id: Icf417c4105143f0bcf1d8ede2e2bce2ac48213f9