Merge "Abort connecting to native daemon during shutdown" am: d763e341b5 am: 0e42b8bab5 am: ce96d1dd9d
am: be931d3147

Change-Id: I391539d8283a37d37d7ffbcc0e1919b79f782ced