Merge "Fix wifi bring up at boot up" into ics-mr1