Merge "Unit test: fix flaky test_networks_returned_with_creds"