
This reverts commit I794522751deb9a60e6487e42df48f582a5e01d2e. Reason for revert: Changes for the fix is implemented as a different FR Change-Id: I19f6e4362ed406c9906e333c1ee0bfa2fe14677e CRs-Fixed: 3598130
This reverts commit I794522751deb9a60e6487e42df48f582a5e01d2e. Reason for revert: Changes for the fix is implemented as a different FR Change-Id: I19f6e4362ed406c9906e333c1ee0bfa2fe14677e CRs-Fixed: 3598130