Merge \\\"SensorList: Don\\\'t output UUIDs\\\" into nyc-dev am: a0c08e2f8f am: 1b02d14df3
am: 13eb266d89

Change-Id: Ifee33b32377bd58eed298ba969db4bd8cce5542b