Merge "Change the existing permission to a system level perm for factory reset prep." into main