Merge "Rely on logs instead to port forwarding in test" into udc-dev