Merge "Change NetworkInterfaceState to hold NetworkProvider instance"