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

* commit '2f50097a5d5a1fb60574c89c7202cc43ecb51c54':
  Fix power issues around wifi scans.