Merge "update shutdown sequence and use shutdown_timeout to cover all wait" am: 59cebb6e6f am: bfb9bea368
am: 3c86cc4bc8

Change-Id: I272adaa945dd14c6bb311040db6e9a414f3adfea