Cleanup SD Card mounting

Change-Id: Id67169c64be97a7c6b2fa32f33787e9156bd9a29