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

Change-Id: Ibf8223ec0469305a97cd4a2caf4323c50b168e05