Fixing vendor once again

Change-Id: Ia073878679480197462d7c7843d33b0d855aaeed