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

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