Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: 94b61cb340

Change-Id: I8803994892af96c0defc5eda5e9a806ce7ec1bc9