am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi