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

* commit '3b98f4b15a0787a325b9a98d061692fd2ecd5df7':
  Fix ImageWriter::ComputeEagerResolvedStringsCallback().