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

Change-Id: I7c5412707d357323bd20957b90c99d32e311fd62