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

Change-Id: Ie8cde55b5e6c8008e2ca6b42a655d0de06a13b7e