[core] improve detection for Toshiba UFDs

* For long standing issue #242