Merge "Telephony: Fix CollectionIncompatibleType"