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

Change-Id: Ia713b450e2dc1de740310df11176ed6164828fdc