Merge "Removing some powermanager proto fields."