Merge "Fix tethering interaction from wifi" into ics-mr1