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

* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID