am d6d65741: Merge "Fix WPS string" into jb-dev

* commit 'd6d65741f98db6db62564d94ab36107880755b0c':
  Fix WPS string