This reverts commit 3b157b3d5f. Reason for revert: To address SWDEV-316216 Change-Id: Ib8e6ac4b87c5e52757cd8f45958f39f012823c60
3b157b3d5f