Merge "String resource edits for Telephony" into lmp-mr1-dev