Merge "Definitely abort reconnecting to native daemon during shutdown" am: 2fd5af1036
am: 282c038240

Change-Id: I034072b89d0a8b9362940155ae2e2d173fde1b33