Merge "Thai font update for Bug2954567."