Merge "Fix misleading param name in FormatJson::encode signature"