Merge "Merge "Add Sim absent assertion in the 1.0 setup" into oc-dev am: 5b472ec138 am: d11dc7ffff am: 3e7fdb0544" into oc-mr1-dev-plus-aosp