Merge "Cleanup uses of sprintf so we can deprecate it."
am: 2c5b89a64a

* commit '2c5b89a64a6ba2e62299635b8d81a17b59703b4c':
  Cleanup uses of sprintf so we can deprecate it.