Reorder device rescue with volume for overlap

Change-Id: I266b9775caf0439937e1889ad9afedb1c1eaadc9
2 files changed