Cleanup SD Card mounting

Change-Id: If4c739efc5b5d2ff1ba023c4f8c14963bdc09586