Merge "init: call umount unconditionally" am: b409e5e00b
am: 121ff413ef

Change-Id: I9a1da7d6ffa4af9968d7b07adf44494ef61df312