Merge "Refactor sensor list in SensorService" into nyc-dev