Merge "Wait for the right number of finalizations." am: fa76b40107
am: b0e6a700f2

Change-Id: I6fa891ae41592fdba559e333259fd874b2c56736