Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407da
am: aeb6820f11

Change-Id: Ie788700dfe65037d80fb1a42ff3dae1030b37405