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

Change-Id: Ifb77dd72e810e758ac3a6105e13f7ea4341dca36