Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev