Merge "Replace os with os_primary"