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

* commit '36ccc3d9fd53a36828638c56b3ae45f8548d7afc':
  Revert "Bug fix in SensorManager."