Merge "Update custom clock flag to a resource" into udc-dev