Merge "Add UnmountTreeWithPrefix util method." am: 2e9aafb620 am: 5e10de1301
am: 8bdc5e6de8

Change-Id: I0c3a14b70c07a6b97cb429350eda653f6fb5954a