am e5e51b72: am 3bc137eb: am 1464bd1a: am fe9da818: Fix for issue 16736964

* commit 'e5e51b7243e8ba7ef7041f7c4ed95467860f13cd':