Merge "Remove URI encoding in BlueprintWebClientService"