am dd749506: Merge "Fix async_stop"

* commit 'dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
  Fix async_stop