Improvements for fixing issues with external SD

Change-Id: Ia271e7e81b0da25f88e641541a55f87bb887f901