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

* commit '0f2e5657d4818806a6ffc6be4069d9978b22f1e2':
  ggrep