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

Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059