Add FinalizerTimeoutMs argument, and respect it am: b215557206
am: 06167b0bca

Change-Id: I342a9c00b5f0cf0cfc346b515550c0b2efe9c4b1