Merge "Make auto-upstream the default tethering behaviour" am: e193298c4a
am: 1239734050

Change-Id: I85f4cc390ea69d3499e1f2341770d586a1cb2b51