Merge "Move subclasses of LogFormatter to their own file"