Merge "Fix issue that VPN connection fail when L2TP secret enable"