Merge "msm: rpm-smd: use data type correctly for a variable"