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

Change-Id: Ia167409dfc3cd13c2d3e0e388e8dbfb16854de37