Merge "Unblock the unmount on uninstallation." into rvc-dev am: 0bfa60f20b am: f414069c78 am: 9e1bb23cd9 am: 08dd6e3bd1 am: 7de9db19de

Change-Id: I0ebc1217aff9f40f5b58071213c6a5f62550ae97