Merge "Merge "Test the encap/timeout for the VCN" into udc-dev am: 6ad488296a" into udc-d1-dev