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

Change-Id: I35d70a225670c1946e0a705e174c856ebe67ba7a