This reverts commit 8520e569. Reason for revert: Bug Fixed Bug:79860717 Bug:80215357 Change-Id: Ibaabe3c6bab72f417b24121a91ec5f953ad18ff7