5b39c346ad
This reverts commit 3e54bad5b3.
Reason for revert: Root cause for regression SWDEV-378321
Change-Id: If3116c5ad1a23db1840e5fc019d2fe997b37d229