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

Change-Id: I3bda8f26fdb7c269d05ded520e6d63f92f2c8d02