Merge "Modify tests to reflect different URL encoding for single quote" into nyc-mr1-dev