am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd"

* commit '3ddc0059bb897c4d7d2e0c6d9812d590388480d1':
  Allocate a UID for clatd