Merge "better error handling in SensorManager" into jb-dev