Merge "ReportLogCollector fixes." into nyc-dev