Merge "Shutdown more reliably" am: 549c3d2e4f am: 7e5b415861 am: 024d6b8910
am: 24c1aeb81e

Change-Id: I0ddc53f199a8735869e8489f90d1bd1c0bc91ecb