am dd20e68d: Merge "Fix device detection and path to tapas"

* commit 'dd20e68d8c37b28be86f2c2a5be8350ec35dd814':
  Fix device detection and path to tapas