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

Change-Id: I0e66ce1ef890e92ad36c25038bd10dceff7e0dab