am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev

* commit '4c32885c4249be9b0a9e674b96ebacc78152b47e':
  Don't put up wifi-available note when disabled