Merge "Force os_primary and os_project_member to be the same" into mcp/epoxy