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

Change-Id: Ib8f83621d7fa7ad2626602838892f672129a562a