Merge "Remove unmount_tree in VolumeManager." am: 9931db7e59
am: 96707825f2

Change-Id: Ie4995f2ee69811f7b3053708ab0784fc33743218