am 48912b93: am afb45246: make wfd work on manta

* commit '48912b930373a168387590179ee3ab1855379517':
  make wfd work on manta