Backport #1033 from 80dc741a6a088d6a9f419471aa33b8ca02c404c5
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.
Description
Backport #1033 from 80dc741a6a088d6a9f419471aa33b8ca02c404c5
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.