Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport"