This reverts commit 6defd49114. Reason for revert: release branch Change-Id: I9c5172bea46977d363901d259067ea0abdfbaead Signed-off-by: Niranjan Reddy Dumbala <quic_dnreddy@quicinc.com>
6defd49114