Merge "Add vendor display name and ID to artifact source properties" into nyc-mr1-dev am: 75d6e21299
am: 71b74072ff

Change-Id: I9451c807db7c006a35907e72e2600a2b0579bcb2