Merge "Fix test_network_quota_exceeding test"