am 14d2548a: am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit '14d2548ab76fa60c0547abdadb26cd27c295fd7c':
  Revert "Bug fix in SensorManager."