am d4e54af0: Merge "Make addUnigramWord use UnigramProperty."

* commit 'd4e54af0bad9cdee02756f4973fb48670005e31a':
  Make addUnigramWord use UnigramProperty.