Merge "Move MergeLogFormatter to 1.25"