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

Change-Id: Ib889b5c4a2ae00618295f0a664a215429352ac57