Cleanup SD Card mounting

Change-Id: I924e29732fcd40addd40eefe134c398a23dfd6fe