Merge "Use different URL encoding for single quote in query" am: 35adfe38c8
am: bb4bcf00bb

Change-Id: I732a512394ca2bbeba7d5555a8673da3b996d736