am ee854b07: Merge "Allocate a UID for clatd"

* commit 'ee854b077766a85279fa1849b537c50837d1a204':
  Allocate a UID for clatd