More stronger way to detect physical data storage devices (with fixs for KVM)

Change-Id: Ia5f400a6ce137ae21e0ce99095856959039b6d41
Merge "More stronger way to detect physical data storage devices (with fixs for KVM)"