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

Change-Id: Ie652236cdbd4734dc723fac8c27ca876161f623d