Fix Move to SD

Change-Id: Ib35896bd03cc5cd46c575f6a610e1251c77bcb04