Fix External storage detection

Change-Id: I0ef995bb664d5f3f782216eb78f19e988ce056d6