Merge "Cleanup uses of sprintf so we can deprecate it."
am: 5a3ac10568

* commit '5a3ac10568e5d729d604c90117550f253ba4b080':
  Cleanup uses of sprintf so we can deprecate it.