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

Change-Id: I29b930d87ee6024f2e097a7beac52734521a14bc