Merge "Update magic number value in comment" into udc-dev