Merge "Switch to standard commands for pno & power save" into jb-dev