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