Merge "tidy up the metrics proto"