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

* commit 'a4d8266e1963dfeec3298831857202422ae713f4':