am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
  Revert "Bug fix in SensorManager."