Merge "Fix the blocking test case issue" into udc-dev