Merge changes from topic "sensor_service_vts" into rvc-dev am: 1786a70193

Change-Id: I04ebad98b23bf0cf4020641135aa3721e0925f4b