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

Change-Id: I02702cfafe58b6e6c249a37ee9e3ea3178d5bdcc