Merge "Clean-up some warnings and docs bugs in PowerManager"