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

Change-Id: I6661cc81def6e549d4ff5b271e8e2bdf47c0afdb