am c869696e: am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev

* commit 'c869696ef3c1dca3efbc6ce8ab804e8a1b117900':
  Fix power issues around wifi scans.