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

Change-Id: I5940a4b20b9d4be040a20679d2115c3c7fab5fb2