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

Change-Id: Icb0b081e77e58761c4c3a9baea0254aa16151f2f