[automerger skipped] Merge changes from topic "c2f2_sensors_vts-qt-dev" into...

[automerger skipped] Merge changes from topic "c2f2_sensors_vts-qt-dev" into qt-dev am: f1708d25 -s ours am: 3ca0b70b -s ours am: 6644fe55 -s ours
am: 2243dccf -s ours
am skip reason: change_id I07e789157e051ceab488a61e856f17d50f435072 with SHA1 63d4f579 is in history

Change-Id: I9f1cdd4d9a5d36b042add862b8786186995682b2