Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
am: 27ce8b0d34

Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e