Merge "Weaver: modify default HAL for passing VTS"