Merge "Place non-mobile tethering upstream types first"