Merge "Remove Index.java from old Search and its dependents"