Merge "Follow TelecomManager API change"