Merge "Add more timeout to SDC CLM"