Merge "Fix an NPE when FileCollector runs." into oc-dev