Merge "Remove deprecated methods from FormatUtil" into stable-2.6