Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev