Merge "Legacy VPN calls to require a userID" into mnc-dev
tree: 7bb9e66ee506ef62eaa6ac12ac371d0dcd9b051b
  1. core/
  2. services/
  3. tests/