Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev