Fixing merge issues with AzureRT PR