Add back device definition for recovery naming

Change-Id: Ib20a6ebcaf70df2e06fade715c331120d382bca8