Add FinalizerTimeoutMs argument, and respect it
am: b215557206

Change-Id: I2aa65b3c7b952c9fff11e71f44a7957b5619db8a