Merge "Make generic BaseNetworkObserver." into jb-mr1-dev