Merge commit '38014a7c' into lmp-dev

Conflicts:
	include/hardware/sensors.h

Change-Id: I21517f717761af7f52c003d535e86059ebb75f05
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index 495828a..a44c155 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -495,9 +495,11 @@
  *
  *  Because this sensor is on-change, events must be generated when and only
  *  when heart_rate.bpm or heart_rate.status have changed since the last
- *  event. The event should be generated no faster than every period_ns passed
- *  to setDelay() or to batch(). See the definition of the on-change reporting
- *  mode for more information.
+ *  event. In particular, upon the first activation, unless the device is known
+ *  to not be on the body, the status field of the first event must be set to
+ *  SENSOR_STATUS_UNRELIABLE. The event should be generated no faster than every
+ *  period_ns passed to setDelay() or to batch().
+ *  See the definition of the on-change reporting mode for more information.
  *
  *  sensor_t.requiredPermission must be set to SENSOR_PERMISSION_BODY_SENSORS.
  *