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

Change-Id: I6b6ecc30646e6e9a912a1ad096bd93fea341968b