Resolve a merge conflict when cherry picking the fix for TRQ-2155.