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

Change-Id: Iefe328e6f10d7dab30c7a64f876690454713b6e5