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

Change-Id: I9d8f2350f41372b4ad3e037c440c8d922874c410