Merge \\\"Skip copying existing vendor images\\\" am: 1767d3f918 am: 85da4d3566
am: 317d1594e4

Change-Id: I609170449d1312537fd40496075c0b60a2bf9e13