Merge "TagLogFormatter: For log entries changing both revid and logid tags, prefer...