am 245c4339: am 46417b84: Merge "Bug fixes for SensorService" into klp-dev

* commit '245c43395b9bb6502e0a4bcde4c60ad9541e5ce2':
  Bug fixes for SensorService