More stronger way to detect physical data storage devices

Change-Id: I2cc09f3b2766edd9351c0df1c6d7a41385db5bbc
Merge " More stronger way to detect physical data storage devices"