Merge "Fix flakes related to concurrent access of PluginManager."