Merge "Remove deprecated methods from FormatUtil"