Fix merge issues with AzureRT PR