Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev