Add escaping

Fix for Ic54ea0c7

Change-Id: Ib92342166ae113f13f33ee39500eea253d1152ce