Merge "sensorservice: switch to use sp<> in sensor list" into nyc-dev