am 47e300c4: am f0c72846: Merge "Sensor Batching Bug fixes." into klp-dev

* commit '47e300c4b44762bcf3de2332eff1b0b00a8123e8':
  Sensor Batching Bug fixes.