Merge "Revert "Add power logging""