Merge "Abort connecting to native daemon during shutdown"
am: d763e341b5

Change-Id: I5b8984d51ff0715b29074cee98197263b5ce1c29