Merge "Improve mergeability of metrics_constants.proto" into nyc-dev