Merge "Up the character limit for thermal strings" into oc-dev am: 95cdc61248
am: cc1e8bce91

Change-Id: I46709c2743dfdb93c838dd86ab658eff35d451e4