Merge "Migrate test classes from deprecated ReportLogs." into nyc-dev