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

* commit '8c8c6d653a93d793ce189efb0b236ed1788a72f0':