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

Change-Id: Iba81d7bf977c85334b98f8c023b8b84c97743aa2