am a54f3b2f: Merge "SensorService fixes." into lmp-dev

* commit 'a54f3b2f4a1d531bca952b5a10fa8181502ce820':
  SensorService fixes.