Merge "Initial removal of some dead code in Telephony" into lmp-mr1-dev