Give grep a chance to find the usages

Change-Id: Ic85546f3369262f6deca5111403ab4f26e7286c6