am 487c7815: am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev

* commit '487c7815d7d81570c4f2cf37ceddf10ec84e0c39':
  SensorService Flush API bug fix.