Merge "Remove duplicate reportConnectionAttemptEnd" into tm-dev