Merge "Speed up Finalizer Daemon"
am: fda522202e

* commit 'fda522202eea5bc3ebad28c40915ba3acfbe8357':
  Speed up Finalizer Daemon