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