Backport f6f62096a1593f36e8889c53a03ed3e4e4940455 from #640
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 f6f62096a1593f36e8889c53a03ed3e4e4940455 from #640
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.