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

Change-Id: I867a9d0636c7617c84abc996e7ff62e733b27e11