Merge "[Telephony] Incorrect target class name" into tm-dev