Merge "Populate host endpoint type in VTS test"