Merge "Revert "(bug 24620) Add types to LogFormatter""