Merge "msm: Add support for 8092 in makefile" into msm-3.4