Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407 am: aeb6820f am: 75c2378e Change-Id: I80082688f4c7c3438ca4e6cdd5eb3cb80fbd4ad1