Merge "Use DM layer directly to manage private DM volumes" am: dd12ea5bd2 am: 47aff8772d

Change-Id: Id3af32b4e83fbfc71492d9050b2215a04b7830a9