Give grep a chance to find the usages

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