Merge "Follow TelecomManager API changes"