Merge "Fix broken CtsVerifierReportLog handling." into sc-dev