Merge "Replace the usage of 'manager' with 'os_primary'"