am 76feaf37: Merge "Append log data to tombstones"

* commit '76feaf37218b7fec02ade30c143884df8299697c':
  Append log data to tombstones