Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev