Merge "Cleanup uses of sprintf so we can deprecate it."
am: 33f2127b43

* commit '33f2127b43c3f0a5bd4496822222810f22e1489d':
  Cleanup uses of sprintf so we can deprecate it.