Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev