Merge "Update test_combine_url"