am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev

* commit '63cc6458ace9da6a064f254323fe493618a6c518':
  Switch over to updated VPN warning strings