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

Change-Id: Id49809aa35dfafb607c8ba781e48e1357981daa6