Merge "Revert "Bug fix in SensorManager."" into mnc-dev