Give grep a chance to find the usages

Change-Id: I6fd9c9a0bf5ffbe3882d18cb90a305ecda8b3896