Merge "Revert "Get rid of SearchIndexableResources entirely.""