Merging to head.

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java

@@ -525,6 +525,10 @@ public class TrackDataHub {
 
           // If this is the only listener we have registered, keep the state that we serve to it as
           // a reference for other future listeners.
+          if (isOnlyListener && reloadAll) {
+            resetState();
+          }
+
           notifyPointsUpdated(isOnlyListener,
               minPointId,
               previousNumPoints,

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParser.java

@@ -40,7 +40,7 @@ public class ZephyrMessageParser implements MessageParser {
     Log.w(Constants.TAG, "Got zephyr data: " + sb);
     // Heart Rate
     Sensor.SensorData.Builder heartrate = Sensor.SensorData.newBuilder()
-        .setValue(buffer[12])
+        .setValue(buffer[12] & 0xFF)
         .setState(Sensor.SensorState.SENDING);
     // Changes Nico Laum (Power and Cadence)
     Sensor.SensorData.Builder power = Sensor.SensorData.newBuilder()