am a17f8bf7: am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."

* commit 'a17f8bf7f4890a23847d39f02a9bc173b902a94a':