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

Change-Id: I587d3c99ce899b1d626344fa9e1e17c49e8a8913