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

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