Merge "Rename BigramProperty to NgramProperty."