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

Change-Id: I08b78668396ec6262ad241bda3499ec7e08511d6