Merge "Replace usage of String.format for performance." into tm-dev