Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev