Merge "msm: pm-stats: fix the bug in pm stats refactor" into msm-3.4