Merge "Revert "STOPSHIP: Add UidCpuPower global setting""