Give grep a chance to find the usages

Change-Id: I49f782d68a162518a894072f72535ec733d019da
Merge "Give grep a chance to find the usages"