use the url encode available on specific platform
Merge branch 'CL-4486813697318'