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

Change-Id: I02c561d034b73ca4dc1795c8e9461aa4909d3b7d