Reorder vendor complete

Change-Id: I328dd0a030ac7b62cb6f01bac40eacaae01eaf27