Merge "Remove some dead code in TelecomServiceImpl" into mnc-dev