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

Change-Id: I59c6e4d8686235c636550abc1f8535574502dabc