Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616
am: 0cf99e2b61

* commit '0cf99e2b618ac5c8a495f607b1978fcd9e3ee827':
  Don't create tombstone directory.