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

Change-Id: I1f11c50df3474de82c3456e23b9eb81347feb441