Merge "Use nanoTime() in finalizer watchdog"