am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when...
am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
* commit '1bc14ed9':
Need to explicitly disable scan-always when turning off wifi