Fix device encryption

LVM /dev/mapper/* devices need to be manually labelled

Change-Id: I6e6c765890974c33fe841007764dfe97078811df