Device: imporve compaitability for recovery

Change-Id: I7cf885b818428c2763551e351e28ae6bafe5612e