Merge "Remove ConnOnActivityStartTest." into tm-dev