Merge "SensorManager API changes." into lmp-dev