Merge "Fixed that telephony registry service reference incorrectly assigned" into oc-mr1-dev