Merge "Use correct module name for stats in executeActionWithErrorHandling()"