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

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