am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown