Merge "sensors:2.0:vts fix functional test for typeAsString field"