Give grep a chance to find the usages

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