Merge \\"Clean up vendor image handling\\" am: 4f807026e2
am: edc6ed7aa0

Change-Id: Ia5dea45324ee41c84d997ca3e83401713e3a9ba9