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

Change-Id: Ie2ac4c33c3f4fe45aab4c17b7a405e70432ca98e