Merge change I117408b2

* changes:
  Restore support for DEX on FAT.