Merge "Removing obselete logging used for flaky test investigation" into main