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

Change-Id: I5056da207f69d483e938f06443b1fe250195dc8b