Merge "Prefer default Internet network for upstream tethering." into pi-dev am: 1e1635a45e
am: a2dd9f8578

Change-Id: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd