Merge "Add Settings.Global configs to high temp warning." into nyc-mr2-dev
am: 0a26aa9b31

Change-Id: Idfd2a48cadb54adcb5f6976ec1a2caf7181db78a