Give grep a chance to find the usages

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