Merge "Use the Finder's results for faster searching" am: 2d71b221cb
am: 1b1997c028

Change-Id: I797bf0041f051b34b4160d2ed12a3ea878ce7aca