Merge "Add UnmountTreeWithPrefix util method."
am: 2e9aafb620

Change-Id: Ifc0d514634e700875aa70d0e24952fc24780cb4d