am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting...

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

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