am db816cef: Merge "Make sure we clean up"

* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up