Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f
am: b339102f67

Change-Id: I660b803f5cdc5e31f6b06373e555718505bcf84d