Fix Move to SD and Mass Storage

Change-Id: I73abb01d434c59e396e1a02399f68fd7a76dfadc