am 6776e7fe: am 90a92053: Various tweaks to wfd

* commit '6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007':
  Various tweaks to wfd