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

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