Give grep a chance to find the usages

Change-Id: Ic2b584c0a53a9fe4eeab3ef931cdb1ed540ac8ab