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

Change-Id: Iaac7b71737036691ebe0190c5fc6ea680be2c0b3