Merge "Fix debug log issue."