am 901367bf: (-s ours) am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit '901367bf66472aa250e48db0492deedd6239f28c':