am b04df590: am 8298b941: Merge "Revert "make wfd work on manta"" into jb-mr1.1-dev

* commit 'b04df5900dec736608661aeb1771efebfec1330f':
  Revert "make wfd work on manta"