Even cleaner shutdown.

Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug: 7247918
5 files changed