am c2ba04b9: am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default."

* commit 'c2ba04b90fc1b787b4e4f39c391ed49d20ce2434':