am 4da2f05b: am 3be9eb46: am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev

* commit '4da2f05b4964d6fc4c55344176f3ad98df569700':
  Clean up Hyphenator file reading