Merge "Add Sim absent assertion in the 1.0 setup" into oc-dev am: 5b472ec138
am: d11dc7ffff

Change-Id: I10e11c1efd73929f65e5ecc1bc0a9a11cac950db