Merge branch 'merge-metrics-rewrite' into merge-metrics

BUG=chromium:370259

Change-Id: I281cb4da5a24b595a1521766dd8d56b253a9ba2d