This reverts commit 01aa8e5430. Signed-off-by: Vaishali Gupta <quic_vai@quicinc.com> Change-Id: Ibc26bbfb334e389d871d5708d2dc1d86b26477e0
01aa8e5430