Fixed merge issue in base/fs_notifier
Abandoning bg_importer.