Merge "Removed telephony apex" into tm-dev