am b04e02b9: am 3a77d009: am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev

* commit 'b04e02b9f70b7a26d1a8dc5927e4fca51168a759':
  Bug fix in SensorManager.