Merge "Migrate off of base::StringPrintf" into main