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

Change-Id: Ia05dcf01d2809a32c78b1a6a0826758f11555fa3