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

Change-Id: I26a69940636e362a3ff5d76ba2eecc012faf39d0