am 2f3d9b3b: Merge "Escape double quotes in trace contents"

* commit '2f3d9b3be8718b4d98524a007cf298ed43e84e0b':
  Escape double quotes in trace contents