Give grep a chance to find the usages

Change-Id: I65fbf2b7cd8d03c669646607e3841eb7d69b4e75
Merge "Give grep a chance to find the usages"