am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev

* commit '81093dd04bc1fdfe1f7389baefb891122e232ff9':
  Legacy VPN calls to require a userID