Use different URL encoding for single quote in query
am: da039605fa

Change-Id: I8a505ab8822fe447eec896181c94bb19faea1f64