Merge "Test TCP and ICMPv6 on VPNs in addition to UDP." into lmp-mr1-dev