Merge "Power manager rewrite." into jb-mr1-dev