Give grep a chance to find the usages

Change-Id: I7cfcd86c3c65d5b2af8c4193c7978b9887a8226e