am 06dd0ef8: Merge "Revert "Use PrevWordsInfo for get/add/remove n-gram(bigram) entry.""

* commit '06dd0ef877d0ed1027a326769274c1f00f8bbf35':
  Revert "Use PrevWordsInfo for get/add/remove n-gram(bigram) entry."