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

Change-Id: Ie75d0d87f841827114c48d92faa548367ff9fc68