Upgrade to Azure SDK 2.5