am 9ccadc82: am a8245d1d: Merge "ggrep" into klp-ub-dev

* commit '9ccadc8246c6c805265046ce02cb5e42c9cc2ee9':
  ggrep