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

Change-Id: Ia791bb67a2351f68da06e0ddc35c224677e4cead