am 30023f4d: Merge "Update input checking logic for adding/removing n-gram."

* commit '30023f4d8daac3678d791a70a6e270f0f1c7156f':
  Update input checking logic for adding/removing n-gram.