am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics

* commit '49fc21c60e5e791b3fa1794675ba9435ded23e73':