am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1

* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up