
As we are merging upstream patches, resolve conflicts of namespaces in downstream modules. Change-Id: I09f4930534b5242335c4884822c5110ca6e8ba8a Signed-off-by: Prakruthi Deepak Heragu <quic_pheragu@quicinc.com> Signed-off-by: Raviteja Tamatam<quic_travitej@quicinc.com>