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

Change-Id: I74677602cd4642c2b441fb353a9f0824a238deae