Merge "Fix CTS failed test cases issue" into udc-dev