am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '504bb9e7709cd51500b68f4220fffb61e11a5e1b':
  Temporarily increase saved tombstone size. DO NOT MERGE