Merge "Issue 3370834: No Echo canceler for SIP"