Merge "Remove unnecessary workaround to vogar escaping issue" am: dd5d8bd15d am: 945ced863d
am: 52fa1c3abc

* commit '52fa1c3abc856c5495cc9410b34e2fb05f04b035':
  Remove unnecessary workaround to vogar escaping issue