Merge "Try to make 036-finalizer less flaky by moving output to one thread"