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

Change-Id: I6f1f8dcf107b0a241ddfb668243d452b0e9b021c