Clean up metrics interaction.
Clean up metrics interaction.

Summary: Address review comments from D175760

Reviewers: nate, kylec

Reviewed By: kylec

Subscribers: changesbot

Differential Revision: https://tails.corp.dropbox.com/D175790

dropbox/changes-client,dropbox/changes-client