No functionally changes. Submitted by: Oleg Karachevtsev <ok@etrust.ru> A part of PR: 57992
PR: 28429 Submitted by: Patrick Li <pat@databits.net>