Don't wait for completion. It can take a long time for big indexes

Change-Id: Ifb1cbfb9c211ada1ff36187c677d38a4aef30432
Merge "Don't wait for completion. It can take a long time for big indexes"