Give grep a chance to find the usages

Change-Id: I3c56f4ae674da12fb882f89001f368eecfc8e5ea