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

Change-Id: Ica9e7b68a791c13a5ccf90aff70a5f0e2c4d92b2