Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev