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

Change-Id: I3d5ff34f134f674cbec66978385ad3936e9c119d