Merge "msm: pm-stats: refactor pm-stats into its own file" into msm-3.0