Merge "test: Fix 036-finalizer test flake on --jvm"
am: a1b035b963

Change-Id: I36384ff527e1cf15ffe3abd619d2b036fea02f31