Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev