Merge "Add 1s delay at start of testThreadCleanup" into oc-dev