Cleanup uses of sprintf so we can deprecate it.

Change-Id: I66a508947054bcda5b7a7b85fde83f5e5b7cd73d
2 files changed