Merge changes from topic "c2f2_sensors_vts" into qt-r1-dev am: 8813be6341
am: bab0c7efe3

Change-Id: I8a1cbcd07455bf945f4eeabbf10ed4c677989f31