am a69c170a: Merge "Rename BigramProperty to NgramProperty."

* commit 'a69c170a3f934dbeec9e1ea5e25c7b737b299c24':
  Rename BigramProperty to NgramProperty.