Update for cleaned up vendor

Change-Id: Ie82455109bf16fca68526d96d388a7137ede73ee