Merge "Upgrade percent-encoding to 2.2.0"