Merge "Add urlencode for URL encoding of lang values"