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

Change-Id: I1470e1195ac34282b0fffc6fd9d594601294cb01