Merge "Small fix to pm dumpsys formatting." into oc-mr1-dev