Merge "Properly handle start results when using wait flag."