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

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