am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev

* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.