am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev

* commit 'c376afb472d1d4f0fba4a03ac4cf05b498866d64':
  Wait a bit longer for wifi to shut down before rewriting the config