Merge "msm: platsmp-8625: cleanup macro names"