Merge "Revert encryption mapping for device wipes."