Merge "Add unmountTree to utils." am: a64572431e
am: f5b24f1015

Change-Id: I4e0a8b784b541013cf1028fbe1ed54dfd31d2782