Remove the use of + when using StringBuilder (1 of 2)

Change-Id: I010b487de26c5a16b3dfda41130d7ea91b1587e8
Remove the use of + when using StringBuilder (2 of 2)

Change-Id: I1637da545620b4d61e5becc2d56cd209daabbc96
Add missing format specifier to String.format

Change-Id: I32eaf2832c73003d3285643543376b44f1b9b4eb
Merge "Remove the use of + when using StringBuilder (1 of 2)"
Merge "Remove the use of + when using StringBuilder (2 of 2)"