Merge "Fix CTS for M-08" into udc-dev