Merge "Skip copying existing vendor images"