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

* commit '3be9eb461150349a8de0f47d18562ac74fb38046':
  Clean up Hyphenator file reading