Merge "Update SetControllerAlwaysOn and PRIVILEGED permission"