Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom