Merge "Update dumpsys power output." into jb-dev