am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
  Fix WiFi-Direct.