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

Change-Id: I91ef20c98fdd354335368c1e07f8e2908f9dbafe