Merge "PowerManager: Minor Coding style issues."