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

* commit '0069b01354ab9a62acaf4547f78688429274f0ef':
  Allocate a UID for clatd