Merge \\"SensorList: Don\\'t output UUIDs\\" into nyc-dev am: a0c08e2f8f
am: 86290abb3c

Change-Id: Ia3101a780fc49fd15ed365f08e31d2c7b642018e