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

Change-Id: I860a840d23cd91f5fdbdfc6f0c35dc20726dc559