Merge "Moved telephony related resource to a separate file" into tm-dev