Merge "Fix FQCN of moved classes in FindBugsExcludeFilter.xml"