Merge "Revert "(bug 24620) Add tests for LogFormatter""