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

Change-Id: I519de36098c5cff1b26a25ad72a8071c7c81f843