Merge "Log the error message when failing to mount/umount." am: 850f89f198
am: 23fe20fb6e

Change-Id: Ic9aa9f793ea2e13dc877d7c55e3c396e8cba455c