am a394b3d2: 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 'a394b3d25f53744ef9802d421422864595d19488':
  Wait a bit longer for wifi to shut down before rewriting the config