Merge "Add back de-flake workaround" into pi-dev