am d672b241: Merge "Fix power manager issues." into jb-dev

* commit 'd672b241f6720201e3b8f613363d71e4291b8597':
  Fix power manager issues.