am 1c8e8c88: am 8c8c6d65: (-s ours) am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus."

* commit '1c8e8c883823fbfb9638194aaadb89ed7ae39266':