am 899c15ef: am db816cef: Merge "Make sure we clean up"

* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up