am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0

* commit '8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
  Fix Tethering settings.