[rhel7-branch] Fix reuse of encrypted devices on rhel7-branch