Merge "Use valid metric ids" into udc-dev