Merge "Fix log message using undeclared variable"