Merge "Revert "Add wait for location import task""