Merge "telephony service support notification channel" into oc-dev