Merge branch 'rewrite-metrics' into merge-metrics

BUG:22773266