Imporve recovery compatability (device part)

Change-Id: I6eaef671e36203e4ea46e6100140760dd9ce2039