Merge "Support seamless handover between VPN fds." into pi-dev
am: f35fd8653c

Change-Id: Ia94a34a1f4763d12b6d5ca702640933bc5c84499