Merge "Revert "Fix testsuites for LogFormatter""