Merge "Fix key value pairs logging on old schema"