072f94c204
This reverts commit 4e2fd192eb.
Reason for revert: Introduces regression SWDEV-503319
Change-Id: I888c5b95d904146e4782e8c57d736878fcdde678