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

Change-Id: I044badaab323b836580b5231e9f2661aa320d1e9