Merge "Make BaseNetworkObserver available to core code" into klp-dev