am 37d0d66c: am 297abc6d: Merge "Remove calls to Entry::~Entry in Delete"

* commit '37d0d66c000409b4f06a6b20377197f1d6b1daf4':
  Remove calls to Entry::~Entry in Delete