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