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

Change-Id: Ib9341113134249f2978b2d59b75719e6f58bde02