Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: c0ca0ceaa5
am: 25aefe9945

Change-Id: I314462d9781c1d63fbb989726a85979c8a655daf