Give grep a chance to find the usages

Change-Id: Ieea6fdb982163a3329558dae34123cdafdd58425