am 329c8d7b: Merge "Ignore bigrams that are not also listed as unigrams" into jb-dev

* commit '329c8d7bcce4f785fa6e31df6cbda0c11014d49b':
  Ignore bigrams that are not also listed as unigrams