Merge "STOPSHIP: Add UidCpuPower global setting"