Merge "Remove unused wait_for function"