Merge "Remove vendor from CloudOwner"