am ce42b94a: am 4401091b: Merge "Better power savings with wifi display code." into jb-mr1-dev

* commit 'ce42b94ae4363c97945732fb8698675fa8b0861a':
  Better power savings with wifi display code.