Merge "Bug 650: Removed unnecessary and performance affecting String.format()"