Merge "Test the encap/timeout for the VCN" into udc-dev