Merge "Speed up Finalizer Daemon" am: fda522202e
am: 4b79842817

* commit '4b798428177e9d514a5dfddfc36110d3b934a93d':
  Speed up Finalizer Daemon