Merge "Replace the usage of 'admin_manager' with 'os_admin'"