Merge "msm: fix compiler issue due to improper braces or indentation"