Merge "Do not query CS in NetworkProvider constructor"