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

Change-Id: Ie6b619808760fedc1174385c091a149d3aaa1107