Merge "Remove Telephony2gUpdater"