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

Change-Id: I5d092796b855c6fd67937b0b6f0ecb5b8ebf59aa