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

* commit '65f1d44cd8d96a4555ce6929bb5e2022307738e8':
  Revert "Bug fix in SensorManager."