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

* commit '1ed64c65a7b4d33799ca42cb4422d8382929cac2':
  Make sure we clean up