Merge "Skip vts for hvac properties" into sc-dev