am 35274252: Merge "Make finalization test more robust"

* commit '35274252040670cec78b7abe8322e5dd9b24ee26':
  Make finalization test more robust