Give grep a chance to find the usages

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