Merge "STOPSHIP: Roll forward: Add UidCpuPower global setting"