Merge "vidc: remove klocwork warnings" into msm-3.0