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

* commit 'f8b96edf47b4d54ccc91842c16cc505901459cae':
  Legacy VPN calls to require a userID