Merge "Sensor: Make getId() more varied" into nyc-dev