Merge "msm: qdss: explicitly add required headers" into msm-3.0