Add in vendor extras

Change-Id: Iee0528e95dbefc9737cbb82d6c99c039ce4f1c8f