am 15b085f8: Merge "Fix issue that VPN connection fail when L2TP secret enable"

* commit '15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9':
  Fix issue that VPN connection fail when L2TP secret enable