Make sure custom grep options don't get in the way

Change-Id: I3c8fa21793906d80790c31ed02f585eff35a64a5
Merge "Make sure custom grep options don't get in the way"