Merge "Fix tethering" into jb-mr2-dev