Merge "msm: platsmp-8625: Refactor code for multicore environment"