Merge changes I830b9f72,Iac0daffd,I604f1fb0

* changes:
  34/n: Rename several trackers to dispatchers
  33/n: Do not upload logs if any fields are unknown
  32/n: Move Face1.0 into its own wrapper