am e4e71e1d: am 194b6e97: Merge "Power manager rewrite." into jb-mr1-dev

* commit 'e4e71e1d06442726e23f8ccf66c75468634008c4':
  Power manager rewrite.