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

Change-Id: I27c26b31a5932b138b5f33eadd18a2403692c022