This reverts commit 23f3921b95. Reason for revert: release branch hot fix Change-Id: I044ce99db921c62d3e2d3c33ed69da3e6a65ad8f Signed-off-by: Niranjan Reddy Dumbala <quic_dnreddy@quicinc.com>
23f3921b95