Merge "Remove unused REPORTING_INTERVAL from resolveStubs.php"