Merge "Remove unused Telephony files" into klp-dev