Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FPII-75: Change the USB vendor ID to match Fairphone vendor