Merge "Fixed that telephony registry service reference incorrectly assigned" am: b0510407da am: aeb6820f11 am: 75c2378ea0
am: 1818704efb

Change-Id: I351ad10c34937741d5516229fcd02d7e286fc706