Merge "Add new type into metrics_constants.proto" into pi-dev