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

Change-Id: Iacb91e0f5a8ba5ac7b7e024950bff8f9ee79491c