Merge "Remove references to AppSearch from removed test suites."