Some of the modules still utilized string concatenation instead of using formatting. In order to align with other modules in the project, I refactored these modules to use string formatting instead. Change-Id: I708392e1d03b6331a134419aa0ae9dc02a05c31b Closes-Bug: 1522738