Merge changes Ia6646363,I94389b64

* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets