Merge "Adjust traces to diagnostic of HWC2on1Adapter"