Merge "DO NOT MERGE  Designate udc-dev* branches as UDC." into udc-dev