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