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

Change-Id: I69b6954043882bd2486bb5cb81d74334a91842ed