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

* commit 'dd5d8bd15d9486c2d596e768436895ce884576a0':
  Remove unnecessary workaround to vogar escaping issue