am 5a3399de: Merge "Fix ImageWriter::ComputeEagerResolvedStringsCallback()."

* commit '5a3399deaf448c8434d9ba0916ff799b1b791d95':
  Fix ImageWriter::ComputeEagerResolvedStringsCallback().