Merge "Just use device configuration for Tethering." into honeycomb