* commit '45a630e87ecfa89682d1b8230dd5c6473284e4c1': Begin moving VPN to NetworkStateTracker pattern.