Merge "Revert "Rename the font file with PostScript name based file name""