Merge "Change the value of constant according to the spec" into udc-dev