Merge "SensorService: Remove unused function" into nyc-dev