Merge "URLConnectionTest: Change character mapping expectations."