Merge changes Ia6646363,I94389b64

* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets
tree: c704c5f0052e881cac5abba845ecff794e655b2b
  1. core/
  2. services/