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

* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
  Fix wifi bring up at boot up