Merge "Remove non-shipping clocks from static list" into udc-dev