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

Change-Id: I216edf81556c49ec918a6e2eff2c30f3b5c99ec3