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

* commit '945ced863df16b3cfa0ca380c9820e76167261b4':
  Remove unnecessary workaround to vogar escaping issue