am 9c8efe6d: am dd749506: Merge "Fix async_stop"

* commit '9c8efe6dfddc9a4800283952caacdaf9b898c43d':
  Fix async_stop