fab70a41ed
This reverts commit 3d15f9cbda.
Reason for revert: SWDEV-368704
Change-Id: I8c38b4f40285f90f7d99145b970c2a14d051d5bb