[automerger skipped] Merge changes from topic "c2f2_sensors_vts-qt-dev" into qt-dev
am: f1708d252a -s ours
am skip reason: change_id I07e789157e051ceab488a61e856f17d50f435072 with SHA1 63d4f57976 is in history

Change-Id: I67f7bfa4e4bef47e2f339fcfa0b2d3451f4e5c5c