Telephony: Make strings consistent

Change-Id: I7c464f8139ede57fb6245854444d524385ab54cf
Merge remote-tracking branch 'cm/cm-11.0' into HEAD