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

Change-Id: Iac6873c142b102d46e8553316808f847b8b2f947