Merge master@5428150 into git_qt-dev.

Change-Id: Ic7fb53f8f3865cd7ed2b1157ed6ccccd1b3aa832
BUG: 129345239
diff --git a/thermal_target.c b/thermal_target.c
index 88d0b30..7298f59 100644
--- a/thermal_target.c
+++ b/thermal_target.c
@@ -180,10 +180,10 @@
 
 static char *cpu_sensors_trinket[] =
 {
-    "cpu-0-0-usr",
-    "cpu-0-1-usr",
-    "cpu-0-2-usr",
-    "cpu-0-3-usr",
+    "cpuss-0-usr",
+    "cpuss-0-usr",
+    "cpuss-0-usr",
+    "cpuss-0-usr",
     "cpu-1-0-usr",
     "cpu-1-1-usr",
     "cpu-1-2-usr",