Merge "Changes for TelecomManager API review"