Cherry pick help for TRQ-2396 fix.