am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev

* commit 'bdf952aab732ebcaab0d785cd02ffb83e3738e21':
  Make Hyphenator#get() return an object.