Merge "msm: pm-stats: Fix bug in computing size of a string" into msm-3.4