Merge change 625 into donut

* changes:
  fix 1812272 SensorManager method returns hidden object