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

Change-Id: I42d34accd9b56d1090a76632751447653cc8dd61