Merge change 6639 into donut

* changes:
  Restore audio settings and wifi.