tree f40dce2f0dedfce55f02d2b5086ae3adfbcc6af5
parent 9515c23e1655849496b34c6265c485fb20d5487f
author Josh Gao <jmgao@google.com> 1455661571 -0800
committer Josh Gao <jmgao@google.com> 1455664055 -0800

Don't create tombstone directory. DO NOT MERGE

Partial backport of cf79748.

Bug: http://b/26403620
Change-Id: I412889bfa331c96ad8e2ce6e0d66b54fb230e8c0