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

Change-Id: I72fc55c1f915ae798fce870c1cdb50a22e9416e3