Merge "Fix tethering upstream determination." into honeycomb-LTE