Merge "Support adding multiple tethering upstreams." into pi-dev