Merge "Add unit test for giving Setup Wizard permission"