Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10 am: 31cd4f16b2
am: 80af251e39

Change-Id: I226294f33f09cc90b50a98febe21a5583adcb3e5