Encode URL parameter

Change-Id: I2eaf564b35624c8441cb8f54f6ab166f5d1762a2
Merge "Encode URL parameter"