b/5076961 Fixes up search patterns

The Search screen won't work correctly until b/5086888 is fixed.

Change-Id: I7b483da506feed45dd4e57b48639a8c75da8ee71
9 files changed