Merge "[sensor] clarify definition of the uuid field" into nyc-dev