Merge "b/5076961 Fixes up search patterns"