Merge "msm: vidc: Fix for KW error"