Merge "return errors properly in BitTube and SensorEventQueue" into jb-dev