Add/update comments for grep

Change-Id: I6402a593872480cac4b76492957771529c1adeb8
Merge "Add/update comments for grep"