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

Change-Id: Id2bd17e649d28cc484292e1f1ec5644c014bc395