Review and merge - KAFKA-6764

[Suman B N]

Team,

Review and merge below pull request.
Merge Request: https://github.com/apache/kafka/pull/5637
Jira: https://issues.apache.org/jira/browse/KAFKA-6764

-- 
*Suman*
*OlaCabs*