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

* commit '68b84a1c2e2034abf30f87c295839e047ee159fa':
  Revert "Bug fix in SensorManager."