LVM changes

Change-Id: I427fd408f5f132c2b955ee0da91f06c0c64cb2ed