Merge "msm: socinfo: Prepend target name to dummy socinfo" into msm-3.0