Merge "Revert "TeleService: Adapt edge-to-edge enforcement"" into main