Give grep a chance to find the usages

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