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