am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev

* commit 'ebff637b894a60a20e62b12089c29779cc6f9e98':
  Always give wifi a chance to quiet down during restore