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

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