Merge "Hide unnecessary test method" into udc-dev