This reverts commit 6bd6115123. Signed-off-by: Vaishali Gupta <quic_vai@quicinc.com> Change-Id: I254f85bd62967a899ce4b4cceab0d8a326932846
6bd6115123