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

Change-Id: I0b0b51d552cd744bcde51385f8f78d27dbd07707