Merge "Shutdown more reliably"
am: 549c3d2e4f

Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31