am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

* commit '76b76666f5c28751db6ed8791fd54ec430d4361a':
  Need to explicitly disable scan-always when turning off wifi