Merge "ion: msm: Add null-pointer check to info struct" into msm-3.4