Merge "msm: rpm: remove the sanity check in rpm log" into msm-3.4