Merge changes from topic "c2f2_sensors_vts-qt-dev" into qt-dev
am: f1708d252a

Change-Id: I1af4f5897b841387b2be12b0a0e1ffafe2f7c70a